Merge branch 'hotfix-1.0.1' into develop
Update from LDAP 1.0 to 2.0
Merge branch 'develop'