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