Sync changes from upstream repository
Merge pull request #670 from github/update-1418416001