Merge with webkit-nix