Merge pull request #2854 from pyhalov/webkit