Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Mar 2015 10:44:35 +0000 (11:44 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Mar 2015 10:44:35 +0000 (11:44 +0100)

Trivial merge