Merge branch 'MDL-66920' of https://github.com/Cvmcosta/moodle