SAK-27928 second patch from Daniel


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