Merge "Surround edit notices with appropriate classes"