Merge branch 'w39_MDL-37324_m26_phpmailer' of https://github.com/skodak/moodle