SAK-26242 merge r310625 from trunk


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