Merge branch '2015.11-develop'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Mar 2016 10:39:00 +0000 (11:39 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Mar 2016 10:39:00 +0000 (11:39 +0100)

Trivial merge