Merge tag 'upstream/1.8.0+dfsg1'
authorJochen Sprickerhof <git@jochen.sprickerhof.de>
Tue, 16 Aug 2016 11:47:40 +0000 (13:47 +0200)
committerJochen Sprickerhof <git@jochen.sprickerhof.de>
Tue, 16 Aug 2016 11:47:40 +0000 (13:47 +0200)
Upstream version 1.8.0+dfsg1


Trivial merge