Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates'