Updated to ocean-rails 1.29.7.
Merge branch 'master' into staging
Merge branch 'staging' into prod