edx/edx-platform — pull request #1800 by flowerhack (2013-11-27 15:20:24+00:00)
Title: DO NOT MERGE for testing purposes

checking out something wonky with acceptance tests