Merge pull request #9607 from neheb/ldap