SAK-23515 merge r308061 from trunk


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