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