Merge branch 'MDL-74424-master' of https://github.com/mihailges/moodle