Merge branch 'click-scripts-fixes' into 'master'

Click scripts fixes

See merge request !93
3 jobs for master in 20 minutes and 15 seconds (queued for 5 seconds)
Status Job ID Name Coverage
  Build
passed #163704
docker
build_linux_36

00:17:32

84.0%
passed #163705
macosx
build_macosx_36

00:09:51

84.0%
 
  Deploy
passed #163706
docker
deploy_beta

00:02:43