Merge "Allow two-tier setup of transwiki import sources"