Sync changes from upstream repository
Merge pull request #674 from github/update-1419353070