[Bug 895876] Upgrade to new upstream version