Merge "Replace deprecated calls to OutputPage::parseInline()"