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