Merge branch 'MDL-68135-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE