Merge branch 'MDL-79246-311' of https://github.com/andrewnicols/moodle into MOODLE_31...