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