Sync changes from upstream repository
Merge pull request #619 from github/update-1413487774