Sync changes from upstream repository
Merge pull request #513 from github/update-1400794063