Merge "Reduce WikiPage::getContentModel() queries via caching"