SAK-23600 merge trunk r124573

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