Merge branch 'MDL-76207-39' of https://github.com/andrewnicols/moodle into MOODLE_39_...