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