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

3 jobs for OPENLDAP_REL_ENG_2_5_3BETA in 47 minutes and 12 seconds (queued for 2 seconds)
latest