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