Merge branch 'MDL-76655-311' of https://github.com/andelacruz/moodle into MOODLE_311_...