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

Trivial merge