Sync changes from upstream repository
Merge pull request #659 from github/update-1417823510