edx/edx-platform — pull request #3961 by davestgermain (2014-06-02 21:12:12+00:00)
Title: Fixes BLD-1104

@adampalay