Merge branch 'MDL-74636_39' of https://github.com/timhunt/moodle into MOODLE_39_STABLE