Merge branch 'master' into 'master'

# Conflicts:
#   src/iso.py
2 jobs for master
Status Job ID Name Coverage
  Build
manual #3805
ISO allowed to fail manual
build_iso
 
  Deploy Testing
manual #3806
rsync allowed to fail manual
deploy_testing