[Gitflow] Merge master into develop#17023

HazAT wants to merge 4 commits into

developgetsentry/sentry-javascript:developfrom

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