Merge branch 'MDL-53166' of https://github.com/eugeneventer/moodle-fixes