Merge branch 'MDL-79937_fixlessonmatching' of https://github.com/catalystfd/moodle