Merge pull request #2733 from castillofrancodamian/samba4