Merge branch 'MDL-73469' of https://github.com/roland04/moodle