Sync changes from upstream repository
Merge pull request #624 from github/update-1413984547