(cherry picked from commit 3aa2269f2b3162772d052154d8bed726ff18df1e) [bwh: Note this in debian/changelog. Neaten vertical spacing.]