[Bug 877951] Upgrade to new upstream version