Merge branch 'MDL-73012-400' of https://github.com/ferranrecio/moodle into MOODLE_400...