Sync changes from upstream repository
Merge pull request #636 from github/update-1415716906