Merge branch '2014.11' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Jun 2016 14:54:03 +0000 (16:54 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Jun 2016 14:54:03 +0000 (16:54 +0200)

Trivial merge