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