Merge pull request #2571 from castillofrancodamian/samba