SAK-22430 merge trunk r110977

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