Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 24 Jun 2015 12:00:04 +0000 (14:00 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 24 Jun 2015 12:00:04 +0000 (14:00 +0200)

Trivial merge