Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 21 Mar 2014 12:05:30 +0000 (13:05 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 21 Mar 2014 12:05:30 +0000 (13:05 +0100)

Trivial merge