re-enables LDAP authentication (d'oh)
Merge branch 'hotfix/20130122'