Sync upstream changes
Merge pull request #577 from github/add-enterprise-changes

Sync upstream changes