Merge branch 'MDL-68323-37' of git://github.com/marinaglancy/moodle into MOODLE_37_STABLE