Comment 13 for bug 194860

Uploaded after merging both debdiff's and adding a mention to the Maintainer change. I haven't tested the changes, please contact me if they cause any new regression.

Thanks for contributing to Ubuntu!