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