Merge tag '10.32'
authorMatthew Vernon <matthew@debian.org>
Fri, 26 Oct 2018 18:26:32 +0000 (19:26 +0100)
committerMatthew Vernon <matthew@debian.org>
Fri, 26 Oct 2018 18:26:32 +0000 (19:26 +0100)
Upstream version 10.32


Trivial merge