SAK-27972 merge 314148 from trunk

git-svn-id: https://source.sakaiproject.org/svn/search/branches/sakai-10.x@315280 66ffb92e-73f9-0310-93c1-f5514f145a0a