Merge branch 'MDL-50142_master' of https://github.com/dmonllao/moodle