Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 2 Jul 2015 10:28:35 +0000 (12:28 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 2 Jul 2015 10:28:35 +0000 (12:28 +0200)

Trivial merge