Merge branch 'MDL-25176' of https://github.com/merrill-oakland/moodle