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