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