SAK-26206 merge r309529 from trunk


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