Sync changes from upstream repository
Merge pull request #638 from github/update-1415717285