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