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