I merely rebased this with the latest merge. Ready to merge for Edubuntu. -- https://code.launchpad.net/~edubuntu-dev/debian-cd/+git/ubuntu/+merge/457639 Your team Edubuntu Developers is subscribed to branch ~edubuntu-dev/debian-cd/+git/ubuntu:main.