Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 10 Apr 2017 13:02:34 +0000 (15:02 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 10 Apr 2017 13:02:34 +0000 (15:02 +0200)

Trivial merge