Stanford-Online/edx-platform — pull request #100 by jbau (2014-08-06 01:40:41+00:00)
Title: DO NOT MERGE THIS IS JASON TESTING JENKINS

from origin/master
into origin/rc