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