Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Dec 2015 09:35:47 +0000 (10:35 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Dec 2015 09:35:47 +0000 (10:35 +0100)

Trivial merge