SAK-20768 merge r123195 from trunk


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