Merge branch 'MDL-68921-39' of git://github.com/vmdef/moodle into MOODLE_39_STABLE