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