Merge branch '2017.11' into 2017.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 9 Aug 2017 14:49:03 +0000 (16:49 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 9 Aug 2017 14:49:03 +0000 (16:49 +0200)

Trivial merge