Merge branch 'MDL-74344-400' of https://github.com/paulholden/moodle into MOODLE_400_...