Sync changes from upstream repository
Merge pull request #594 from github/update-1409951312