Rebase date changes onto the latest master