KNL-1015 merge r122405 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@122516 66ffb92e-73f9-0310-93c1-f5514f145a0a