Merge "Make Title::makeTitleSafe() not need user variant"