Merge branch 'rs/apply-epoch' into next

Code simplification.

* rs/apply-epoch:
apply: remove epoch date from regex
apply: check date of potential epoch timestamps first

diff --cc apply.c
Simple merge