Syncing with upstream

Use a global api_key in xkit_patches
Merge remote-tracking branch 'origin/apiv2-fix' into faster-xkit2

Conflicts:
	Extensions/xkit_patches.js