SAK-22723 merge 312425 from trunk

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