ORA2 release-2014-06-02T15.45
Merge pull request #3955 from edx/will/ora2-release-2014-06-02T15.45

ORA2 release-2014-06-02T15.45