Merge branch '2017.11' into 2017.11-develop 2017.08.1
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Aug 2017 10:17:09 +0000 (12:17 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Aug 2017 10:17:09 +0000 (12:17 +0200)

Trivial merge