r20269: merge -r20264:20267 from SAMBA_3_0_24