[Gitflow] Merge master into develop#12934

HazAT wants to merge 4 commits intodevelopgetsentry/sentry-javascript:developfrom

mastergetsentry/sentry-javascript:masterCopy head branch name to clipboard