Merge branch 'ldap_parser'