Merge upstream changes

Merged Philip Müller requested to merge calamares:master into upstream-master

Created by: philmmanjaro

Merge request reports