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