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