SAK-12574 merge trunk r124063

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