SAK-21386 merge trunk r106606

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