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