Merge pull request #18 from rafaelgonzalez/flash-messages

Flash messages [Fixes #72872078]
Merge branch 'master' into clean-up-mailer-settings