* Merge from debian unstable (LP: #350287), Ubuntu remaining changes: - Remove python-xml from Recommends field, the package isn't anymore in sys.path. * debian/patches/10002_encodeAddress_fix_MIME_spacing.patch: - Headers are malformed in notification email when, in mail_from, there is a phrase before the angle address that gets encoded. Thanks to Matthias Andree for the patch (LP: #348960). * debian/rules: - Add --install-layout=deb option to install everything in /usr instead of /usr/local, fix FTBFS.