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

Trivial merge