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