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