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