Resolve merge conflict
Merge branch 'bootstrap-api-changes' of github.com:getsentry/sentry into HEAD