Sync Academic v3-dev

This commit is contained in:
George Cushen 2018-10-14 02:15:45 +01:00
parent 08b6ed2f94
commit 5177dc25b1
11 changed files with 57 additions and 18 deletions

@ -1 +1 @@
Subproject commit f78135f432b2f1115cca32825e0f25f06ba45213
Subproject commit 061b56a088532d03b64ffb3848819f55cd0b3db1