Sync changes from upstream repository
Merge pull request #643 from github/update-1416608966