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