SAK-28083 Merge 315433 from trunk

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