Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 7 May 2015 14:48:23 +0000 (16:48 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 7 May 2015 14:48:23 +0000 (16:48 +0200)

Trivial merge