KNL-1096 merge r127495 from trunk

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