Merge branch '2016.11-develop-ldap' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 19 Jun 2017 10:55:21 +0000 (12:55 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 19 Jun 2017 10:55:21 +0000 (12:55 +0200)

Trivial merge