merge upstream changes to date.
This tag has no release notes.