Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 13 Jun 2017 13:49:02 +0000 (15:49 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 13 Jun 2017 13:49:02 +0000 (15:49 +0200)

Trivial merge