Merge "DifferenceEngine: show undo links for non-text content"