edx/edx-platform — pull request #1849 by nedbat (2013-12-04 20:44:44+00:00)
Title: Ned/merge lti hotfix

Just the three changes we needed from the LTI fix.