Require ocean/zero_log explicitly in lib.
Merge branch 'staging' into prod