Merge branch 'MDL-77559-400-2' of https://github.com/andrewnicols/moodle into MOODLE_...