Merge branch 'MDL-74812-311' of https://github.com/junpataleta/moodle into MOODLE_311...