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