Merge pull request #4024 from eduardomozart/master-1