Merge "Make HTML generation in RenderedRevision optional"