Merge pull request #3997 from eduardomozart/patch-4