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

Trivial merge