Merge "Remove wrong null type from @param of Content::fillParserOutput"