Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 13 Jul 2015 11:07:45 +0000 (13:07 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 13 Jul 2015 11:07:45 +0000 (13:07 +0200)

Trivial merge