Fix theming for user mailer
Merge branch 'master' into wip-gv-integration