Merge "Fix WikiPage::prepareContentForEdit's default format handling"