Help the flash message from getting in the way
Merge branch 'master' into staging