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

Trivial merge