Sync changes from upstream repository
Merge pull request #644 from github/update-1416906866