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