back to LDAP. gonna try to get it working
Merge remote-tracking branch 'origin/master'