Merge "API: Improve handling of interwiki redirects when resolving"