Remove Markup from Flash Message
Merge branch 'flash_tweak' into development