Merge "Fix potential divide by zero in display_html"