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