Use xfs for /mnt
Install xfsprogs
Merge branch 'master' into mnt_on_xfs
Optionally do a 'dist-upgrade'
Merge branch 'master' into mnt_on_xfs