SAM-2136 patch direct to 2.9.x branch because of differences between trunk and 2.9.x. From Alexandre Balleste


git-svn-id: https://source.sakaiproject.org/svn/sam/branches/samigo-2.9.x@123243 66ffb92e-73f9-0310-93c1-f5514f145a0a