prepping the SAMBA_3_0 branch for 3.0.3 work