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