Merge branch 'click' into 'master'

Update for click 7 upgrade

See merge request !98
3 jobs for master in 8 minutes and 3 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #159620
docker
build_linux_36

00:04:00

70.0%
passed #159621
macosx
build_macosx_36

00:05:12

70.0%
 
  Deploy
passed #159622
docker
deploy_beta

00:02:51