BLTI-174 merge trunk r110223

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