edx/edx-platform — pull request #1979 by auraz (2013-12-17 16:55:44+00:00)
Title: Alex/lti fixes to release

Contains fixes for BLD-561 and BLD-564