SAK-20413 merge trunk r91692

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