Merge in WebKit master branch.