Merge tag 'upstream/1.8.0+dfsg'
authorJochen Sprickerhof <git@jochen.sprickerhof.de>
Mon, 15 Aug 2016 15:10:08 +0000 (17:10 +0200)
committerJochen Sprickerhof <git@jochen.sprickerhof.de>
Mon, 15 Aug 2016 15:10:08 +0000 (17:10 +0200)
Upstream version 1.8.0+dfsg


Trivial merge