Merge branch 'MDL-69505-39' of https://github.com/snake/moodle into MOODLE_39_STABLE