SAK-23730 manual merge of r130999 with patch from Daniel


git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@308568 66ffb92e-73f9-0310-93c1-f5514f145a0a