SAK-23678 merge r125715 from trunk


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