Merge xpa (2.1.18-1) import into refs/heads/workingbranch
authorOle Streicher <olebole@debian.org>
Sat, 15 Oct 2016 12:54:17 +0000 (13:54 +0100)
committerOle Streicher <olebole@debian.org>
Sat, 15 Oct 2016 12:54:17 +0000 (13:54 +0100)

Trivial merge