Merge branch 'fixes' into 'master'

Histo fix

See merge request !76
5 jobs for master in 15 minutes and 14 seconds (queued for 7 seconds)
Status Job ID Name Coverage
  Build
passed #140648
docker
build_linux_27

00:14:58

86.0%
passed #140649
docker
build_linux_36

00:14:11

86.0%
passed #140650
macosx
build_macosx_27

00:08:59

86.0%
passed #140651
macosx
build_macosx_36

00:08:24

86.0%
 
  Deploy
passed #140652
deployer
deploy_beta

00:00:16