Merge branch 'MDL-55299-master' of git://github.com/ferranrecio/moodle into master