Merge branch 'master' into 'timmermanns'

# Conflicts:
#   .gitlab-ci.yml
#   settings.xml
2 jobs for timmermanns in 4 minutes and 5 seconds (queued for 1 second)
Status Job ID Name Coverage
  Windows
passed #128234
Windows10
masterJobWindows

00:02:39

 
  Linux
passed #128235
BranchJobLinux

00:01:25