[Bug 973910] Upgrade to new upstream version