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