Merge branch 'MDL-37676' of git://github.com/appalachianstate/moodle