SAK-27547 merge 310948 to 10.x

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