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