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