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