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