Merge branch 'MDL-74173-master' of https://github.com/junpataleta/moodle