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