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