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