Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 6 Mar 2015 17:09:33 +0000 (18:09 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 6 Mar 2015 17:09:33 +0000 (18:09 +0100)

Trivial merge