Comment 10 for bug 1511222

Here's an updated debdiff to apply this patch, with better formatting for the changelog entry