Sync Academic v3-dev

This commit is contained in:
George Cushen 2018-10-01 00:16:12 +01:00
parent 6bcd182537
commit 08b6ed2f94
6 changed files with 100 additions and 29 deletions

@ -1 +1 @@
Subproject commit a1989ea25c4bfa8fe82d305ff9b49059b23d4257
Subproject commit f78135f432b2f1115cca32825e0f25f06ba45213