KNL-1285 merge r311166 from trunk


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