Sync changes from upstream repository
Merge pull request #650 from github/update-1417434711