Syncing with upstream

Use a global api_key in xkit_patches