Merge branch 'MDL-79589-master' of https://github.com/ferranrecio/moodle