r23685: merge from SAMBA_4_0: