ORA2 release-2014-07-07T19.28
Merge pull request #4323 from edx/will/ora2-release-2014-07-07T19.28

ORA2 release-2014-07-07T19.28