[Bug 1097055] Upgrade to new upstream version