Merge branch '2015.11-develop' into 2016.03 2016.03.2
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 21 Apr 2016 09:09:13 +0000 (11:09 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 21 Apr 2016 09:09:13 +0000 (11:09 +0200)

Trivial merge