Fixing LDAP authentication (refs: #539)
Merge remote-tracking branch 'origin/dev' into dev