SAK-23766 merge trunk r126840

git-svn-id: https://source.sakaiproject.org/svn/osp/branches/sakai-2.9.x@127122 66ffb92e-73f9-0310-93c1-f5514f145a0a