Sync changes from upstream repository
Merge pull request #539 from github/update-1403161035