[Bug 916064] Upgrade to new upstream version