Merge branch 'MDL-30607_override_email' of git://github.com/andyjdavis/moodle