Merge tag 'upstream/10.22'
authorMatthew Vernon <matthew@debian.org>
Tue, 2 Aug 2016 17:57:39 +0000 (18:57 +0100)
committerMatthew Vernon <matthew@debian.org>
Tue, 2 Aug 2016 17:57:39 +0000 (18:57 +0100)
Upstream version 10.22


Trivial merge