Merge branch 'master' into...

Merge branch 'master' into 31-please-remove-the-installation-medium-then-press-enter-meldung-entfernen

# Conflicts:
#	files/grub.cfg
1 job for 31-please-remove-the-installation-medium-then-press-enter-meldung-entfernen in 26 minutes and 10 seconds (queued for 1 second)