Merge branch 'develop' into 'master'

Shared code, updated for CNNArchLang

See merge request !40
2 jobs for master in 5 minutes and 33 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Windows
passed #388602
Windows10
masterJobWindows

00:01:23

 
  Linux
passed #388603
masterJobLinux

00:04:10