Remove padding in here - notices have their own margin
Merge branch 'refs/heads/3.0/develop' into production