[Bug 1086545] Upgrade to new upstream version