[Merge] ~edubuntu-dev/casper:main into casper:main

[Simon Quigley]

> I strenuously object to making any changes that divert from the original file other than what it takes to merely get it functioning.

Okay, so let's fix both files, either in this MP or another one. :)
-- 
https://code.launchpad.net/~edubuntu-dev/casper/+git/casper/+merge/457266
Your team Edubuntu Developers is subscribed to branch ~edubuntu-dev/casper:main.