Merge pull request #1705 from iemejia/master