Merge branch 'mdl-76729_401' of https://github.com/james-cnz/moodle into MOODLE_401_S...