Merge "mediawiki.Title: Generalise filename-matching in newFromImg"