Merge "Move span.comment back to shared.css as its more widely used"