Merge branch '2017.11' into 2017.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 3 Aug 2017 13:01:07 +0000 (15:01 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 3 Aug 2017 13:01:07 +0000 (15:01 +0200)

Trivial merge