SAK-21319 merge trunk r125464

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