[Bug 1209748] Upgrade to new upstream version