Stanford-Online/edx-platform — pull request #135 by stvstnfrd (2014-10-08 21:50:32+00:00)
Title: Merge upstream

from edx:hotfix-2014-10-01 (8323939)
into Stanford-Online:master

This includes upstream's penultimate release plus subsequent hotfixes.