SAK-22213 merge trunk r108814

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