SAK-25279 merged Dave's patch into trunk

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