Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 6 Mar 2017 12:33:17 +0000 (13:33 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 6 Mar 2017 12:33:17 +0000 (13:33 +0100)

Trivial merge