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