Merge "ContentHandler: TextContent::diff should compare to given object, not itself"