Fix preview escaping on announcements
Merge branch 'master' into develop