Merge pull request #2466 from HenryGiraldo/master