Merge branch 'MDL-77413-401' of https://github.com/andelacruz/moodle into MOODLE_401_...