SAM-2374 sam-patch-2 from Peter


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