Original change: SHA 58e98d This was resolved by merging in Cale's branch https://github.com/edx/edx-platform/pull/44
