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