Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 7 May 2015 14:47:16 +0000 (16:47 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 7 May 2015 14:47:16 +0000 (16:47 +0200)

Trivial merge