Sync changes from upstream repository
Merge pull request #646 from github/update-1416942459