Merge branch 'metrics' into 'master'

Various fixes

See merge request !167
5 jobs for master in 27 minutes and 28 seconds (queued for 10 seconds)
Status Job ID Name Coverage
  Build
passed #141752
docker
build_linux_27

00:12:51

89.0%
passed #141753
docker
build_linux_36

00:13:44

89.0%
passed #141754
macosx
build_macosx_27

00:12:44

89.0%
passed #141755
macosx
build_macosx_36

00:11:53

89.0%
 
  Deploy
passed #141756
deployer
deploy_beta

00:00:30