Merge "interwiki: Fix-up for I5a979f047031e"