Merge branch 'MDL-54559-int-master' of https://github.com/merrill-oakland/moodle