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