merge from 2.2 fix for smbclient large files