Merge with 0.9.11 from openldap project