Merge branch 'MDL-37804' of github.com:recreate/moodle