Sync changes from upstream repository
Merge pull request #629 from github/update-1414561467