Merge branch 'MDL-34211' of git://github.com/appalachianstate/moodle into MOODLE_23_S...