Merge remote-tracking branch 'origin/master' into system-exit

4 jobs for system-exit
Status Job ID Name Coverage
  Build
passed #2937
docker
linux

00:00:36

passed #2938
openswift
osx

00:00:26

passed #2933
docker
linux

00:00:37

passed #2934
openswift
osx

00:00:25