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

Trivial merge