Merge branch 'MDL-42069' of https://github.com/appalachianstate/moodle