Merge branch 'MDL-74078-master' of https://github.com/mickhawkins/moodle