Merge branch 'click' into 'master'

Update for click 7 upgrade

See merge request !98
4 jobs for master in 23 minutes and 18 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Build
failed #163014
docker
build_linux_36

00:06:16

passed #163004
macosx
build_macosx_36

00:17:02

70.0%
failed #163003
docker
build_linux_36

00:16:04

 
  Deploy
skipped #163005
docker
deploy_beta
 
Name Stage Failure
failed
build_linux_36 Build
No job trace