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