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