SAK-23301 merge trunk r121395

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