ORA2 release-2014-08-07T20.03
Merge pull request #4742 from edx/will/ora2-release-2014-08-07T20.03

ORA2 release-2014-08-07T20.03