OpenLDAP-etc branch master updated. 1dfdd0c8b886429df3ca8e7e958b2fac8ee78059