Merge branch '2013.10'
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 5 May 2014 15:21:23 +0000 (17:21 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 5 May 2014 15:21:23 +0000 (17:21 +0200)

Trivial merge