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