pick lint
Merge branch 'add_ldap_support'