SAK-22620 merge trunk r112468

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