Merge commit 'refs/top-bases/t/misc/time-day' into t/misc/time-day