[Bug 785073] Upgrade to new upstream version