SAK-22578 merge r310262 from trunk


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