Merge branch '2015.11-develop'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Mar 2016 14:06:33 +0000 (15:06 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Mar 2016 14:06:33 +0000 (15:06 +0100)

Trivial merge