Merge branch '2015.11-develop'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 16 Mar 2016 16:53:33 +0000 (17:53 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 16 Mar 2016 16:53:33 +0000 (17:53 +0100)

Trivial merge