Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 21 Dec 2015 11:45:00 +0000 (12:45 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 21 Dec 2015 11:45:00 +0000 (12:45 +0100)

Trivial merge