[Bug 915292] Upgrade to new upstream version