Merge "fix sidebar HTML escaping in CologneBlue (again)"