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

The three fixes we need from the LTI fix.