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