Merge branch 'finalplot' into 'master'

Various fix

See merge request !48
5 jobs for master in 15 minutes and 42 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Build
passed #142505
docker
build_linux_27

00:15:19

passed #142506
docker
build_linux_36

00:14:57

passed #142507
macosx
build_macosx_27

00:08:47

passed #142508
macosx
build_macosx_36

00:09:16

 
  Deploy
passed #142509
deployer
deploy_beta

00:00:16