Merge pull request #3537 from wsnipex/samba4