edx/edx-platform — pull request #6280 by jmclaus (2014-12-16 20:43:33+00:00)
Title: Fix for TNL-1018.

Addresses https://openedx.atlassian.net/browse/TNL-1018