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