Merge with 0.9.14 from OpenLDAP project