Sync changes from upstream repository
Merge pull request #511 from github/update-1400537581