Merge pull request #2687 from HenryGiraldo/master