Sync changes from upstream repository
Merge pull request #590 from github/update-1409339000