[Bug 756294] Upgrade to new upstream version