Pre merge.


git-svn-id: https://source.sakaiproject.org/svn/basiclti/branches/SAK-25381@310130 66ffb92e-73f9-0310-93c1-f5514f145a0a