Hmh, remember to work actually on "upstream", not "master" :-|
Merge branch 'upstream'
Target at unstable; push this package's standards-version to 3.9.5
Typo
Typo fix