Now using ocean-rails 3.0.3, which eliminates the constant definition ordering problem.
Merge branch 'master' into staging