Merge branch 'develop' into 'master'

Shared code, updated for CNNArchLang, etc.

See merge request !17
3 jobs for master in 6 minutes and 11 seconds (queued for 8 minutes and 24 seconds)
Status Job ID Name Coverage
  Windows
passed #388853
Windows10
masterJobWindows

00:01:29

 
  Linux
passed #388854
masterJobLinux

00:04:42

passed #388855
PythonWrapperIntegrationTest

00:03:30