Merge branch 'MOODLE_master_MDL-73378' of https://github.com/danielneis/moodle