SAK-23558 merge r123370 from trunk


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