Merge branch 'MDL-65967-37' of https://github.com/danielneis/moodle into MOODLE_37_STABLE