Merge branch 'small' into 'master'

Improvements to new metrics codes

See merge request !70
5 jobs for master in 13 minutes and 54 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build
passed #140417
docker
build_linux_27

00:13:34

86.0%
passed #140418
docker
build_linux_36

00:13:03

86.0%
passed #140419
macosx
build_macosx_27

00:09:34

86.0%
passed #140420
macosx
build_macosx_36

00:09:07

86.0%
 
  Deploy
passed #140421
deployer
deploy_beta

00:00:13