Merge branch 'develop' into 'master'

Updated versions and fixed bugs

See merge request !30
2 jobs for master in 5 minutes and 26 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Windows
passed #630010
Windows10
masterJobWindows

00:01:49

 
  Linux
passed #630011
masterJobLinux

00:03:36