Sync changes from upstream repository
Merge pull request #520 from github/update-1402007349