Merge branch 'master' into develop

2 jobs for develop
Status Job ID Name Coverage
  Build
passed #3636
autoscale-linux
linux

00:02:43

passed #3637
openswift atbuild
osx

00:00:18