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

Trivial merge