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