Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 17 Apr 2015 18:32:17 +0000 (20:32 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 17 Apr 2015 18:32:17 +0000 (20:32 +0200)

Trivial merge