Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 10 Nov 2015 08:29:23 +0000 (09:29 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 10 Nov 2015 08:29:23 +0000 (09:29 +0100)

Trivial merge