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