Sync changes from upstream repository
Merge pull request #637 from github/update-1415717108