merge trunk r115820,121087

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/samigo-2.9.x@121662 66ffb92e-73f9-0310-93c1-f5514f145a0a