Merge branch 'develop' into 'master'

Shared code, updated for CNNArchLang

See merge request !27
2 jobs for master in 4 minutes and 29 seconds (queued for 9 minutes and 29 seconds)
Status Job ID Name Coverage
  Windows
passed #388856
Windows10
masterJobWindows

00:01:20

 
  Linux
passed #388857
masterJobLinux

00:03:09