SAK-22647 merge r309718 from trunk


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