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