[Bug 885594] Upgrade to new upstream version