Merge branch 'bob6' into 'master'

Preparing release Bob 6

See merge request !241
3 jobs for master in 88 minutes (queued for 3 seconds)
Status Job ID Name Coverage
  Build
passed #166175
docker
build_linux_36

01:25:09

69.0%
passed #166176
macosx
build_macosx_36

01:20:56

68.0%
 
  Deploy
passed #166177
docker
deploy_beta

00:02:51