Updated bundle to ocean-rails 1.29.5 with one-line prod logging.
Merge branch 'master' into staging
Merge branch 'staging' into prod