Sync changes from upstream repository
Merge pull request #560 from github/update-1406306854