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