Merge branch 'ldap_parser' into database