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

3 jobs for OPENLDAP_REL_ENG_2_5 in 55 minutes and 27 seconds (queued for 16 minutes and 9 seconds)