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