Merge branch 'master' into...
Merge branch 'master' into 31-please-remove-the-installation-medium-then-press-enter-meldung-entfernen # Conflicts: # files/grub.cfg
Merge branch 'master' into 31-please-remove-the-installation-medium-then-press-enter-meldung-entfernen # Conflicts: # files/grub.cfg