Merge branch 'MDL-78994_master' of https://github.com/marxjohnson/moodle