Merge branch 'MDL-54963_master' of git://github.com/dmonllao/moodle