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