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