Fixup email templates swapped in error.
Merge branch 'master' into live