Merge branch '2015.11-develop' into 2016.03 2016.03.3
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jun 2016 10:14:58 +0000 (12:14 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jun 2016 10:14:58 +0000 (12:14 +0200)

Trivial merge