Merge branch '94_improve_complex_setup_handling' into 'master'

improve complex setup handling

See merge request !111
5 jobs for master in 17 minutes and 35 seconds (queued for 1 second)
Status Name Job ID Coverage
  Build
passed build_linux_36 #190024
docker-build

00:13:34

64.0%
passed build_linux_37 #190025
docker-build

00:13:22

64.0%
passed build_macosx_36 #190022
macosx

00:16:25

64.0%
passed build_macosx_37 #190023
macosx

00:16:07

64.0%
 
  Deploy
passed deploy_beta #190026
docker

00:01:10