Merge upstream

from edx:hotfix-2014-10-01 (8323939)
into Stanford-Online:master

This includes upstream's penultimate release plus subsequent hotfixes.