Merge branch 'MDL-78040-402' of https://github.com/paulholden/moodle into MOODLE_402_...