Merge branch 'MDL-69102-310' of https://github.com/martygilbert/moodle into MOODLE_31...