r23039: merge from SAMBA_3_0_26: