Merge branch '2017.11' into 2017.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Aug 2017 08:39:15 +0000 (10:39 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Aug 2017 08:39:15 +0000 (10:39 +0200)

Trivial merge