Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

3 jobs for OPENLDAP_REL_ENG_2_5_1ALPHA in 33 minutes and 47 seconds (queued for 23 minutes and 21 seconds)
latest