Merge branch 'master' into 'imgNr1'

# Conflicts:
#   include/PcoGitVersion.h
9 jobs for imgNr1 in 23 minutes and 56 seconds (queued for 1 second)