Merge "Remove unused OAuthToken in authorisation URL" into stable-2.10