Merge branch '2015.11-develop-postal' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 10 Jun 2016 16:18:29 +0000 (18:18 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 10 Jun 2016 16:18:29 +0000 (18:18 +0200)

Trivial merge