Merge branch 'MDL-77333_401' of https://github.com/stronk7/moodle into MOODLE_401_STABLE