Merge branch 'minor-fixes' into 'master'

Minor fixes

See merge request !9
5 jobs for master in 5 minutes and 17 seconds (queued for 8 seconds)
Status Job ID Name Coverage
  Build
passed #181217
docker
build_linux_36

00:04:17

44.0%
passed #181218
docker
build_linux_37

00:04:20

44.0%
passed #181215
macosx
build_macosx_36

00:01:03

passed #181216
macosx
build_macosx_37

00:01:03

 
  Deploy
passed #181219
docker
deploy_beta

00:00:53