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