SAK-26303 merge r310377	from trunk


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