[oe] [for-danny, for-dylan] Samba fix

[Otavio Salvador]

Hello Eric,

Please cherry-pick the bac6da16a0d57f30c2cde1d805b3957147abdaeb into dylan
and danny.

Regards,

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750