Merge branch '2017.11' into 2017.11-develop 2017.08 master 2017.08.3
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 14 Aug 2017 12:38:11 +0000 (14:38 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 14 Aug 2017 12:38:11 +0000 (14:38 +0200)

Trivial merge