Rebased on top of current master

Hello, I've rebased the extra-package branch on top of current master. It applied cleanly, with the small exception of `debian/changelog` which required some reformatting (I removed the `Signed-off-by` tag for this reason, feel free to reapply it).

I'll ping upstream again shortly. :/