Sync changes from upstream repository
Merge pull request #669 from github/update-1418415016