Merge pull request #2616 from castillofrancodamian/samba