Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 7 Jan 2016 11:54:38 +0000 (12:54 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 7 Jan 2016 11:54:38 +0000 (12:54 +0100)

Trivial merge