Merge branch '2016.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 13 Jul 2016 09:12:44 +0000 (11:12 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 13 Jul 2016 09:12:44 +0000 (11:12 +0200)

Trivial merge