Merge branch 'master' into 'condapackage'

# Conflicts:
#   .gitlab-ci.yml
4 jobs for condapackage
Status Job ID Name Coverage
  Build
canceled #124191
docker
build_linux_27

canceled #124192
docker
build_linux_36

canceled #124193
macosx
build_macosx_27

canceled #124194
macosx
build_macosx_36