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