SAK-22519 merge r120126 from trunk


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