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