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