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