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