Merge branch 'MDL-54916' of https://github.com/mr-russ/moodle