Merge branch 'MDL-69192' of https://github.com/willob99/moodle