Merge branch 'MDL-53234-support-email' of https://github.com/brendanheywood/moodle