Merge branch 'ak/apply-non-git-epoch' into maint

* ak/apply-non-git-epoch: apply: handle patches with funny filename and colon in timezone apply: Recognize epoch timestamps with : in the timezone