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