Xenial backport @ https://code.launchpad.net/~philroche/livecd-rootfs/+git/livecd-rootfs/+merge/454068
Xenial backport @ https:/ /code.launchpad .net/~philroche /livecd- rootfs/ +git/livecd- rootfs/ +merge/ 454068