Merge branch 'MDL-51461' of https://github.com/andrewhancox/moodle