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