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