Sync changes from upstream repository
Merge pull request #634 from github/update-1415152834