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