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


Trivial merge