[Bug 844988] Upgrade to new upstream version