SAK-23697 second patch from Joseph at Duke


git-svn-id: https://source.sakaiproject.org/svn/assignment/trunk@134235 66ffb92e-73f9-0310-93c1-f5514f145a0a