KNL-1038 merge r122034 from trunk


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