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