Merge branch 'minor-fixes' into 'master'

Minor fixes

See merge request !32
5 jobs for master in 19 minutes and 20 seconds (queued for 4 seconds)
Status Name Job ID Coverage
  Build
passed build_linux_27 #125129
docker

00:07:10

passed build_linux_36 #125130
docker

00:07:25

passed build_macosx_27 #125131
macosx

00:18:54

passed build_macosx_36 #125132
macosx

00:18:49

 
  Deploy
passed deploy_beta #125133
deployer

00:00:26