Patch LDAP and various bugfixing.
Merge remote branch 'upstream/master'