Upstream upgrades and bugfixes
This tag has no release notes.