Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 1 Apr 2015 12:34:28 +0000 (14:34 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 1 Apr 2015 12:34:28 +0000 (14:34 +0200)

Trivial merge