Merge branch 'develop'
Merge branch 'develop' into release-1.0
Merge branch 'release-1.0'
Downgrade ldap to older version.
Merge branch 'hotfix-1.0.1' into develop