Lyndsysimon feature/mako html safety

Syncs with develop and resolves merge conflicts