Only email on change
Merge branch 'master' into redesign