Permit HTML in alerts
Merge branch 'dev'