Merge branch 'MDL-29615_control_override_email2' of git://github.com/andyjdavis/moodle