[Bug 837746] Upgrade to new upstream version