Merge branch 'MDL-59485' of https://github.com/IMSGlobal/moodle