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