[Bug 916064] New: Upgrade to new upstream version