Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 7 Apr 2016 07:42:13 +0000 (09:42 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 7 Apr 2016 07:42:13 +0000 (09:42 +0200)

Trivial merge