Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Sep 2016 12:53:45 +0000 (14:53 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Sep 2016 12:53:45 +0000 (14:53 +0200)

Trivial merge