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