Sync changes from upstream repository
Merge pull request #621 from github/update-1413817590