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