Date-a-merge

by RStewart @RStewart