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