Merge with 0.9.10 from openldap project