[Bug 877913] Upgrade to new upstream version