Merge branch 'bug/54552' into staging

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@78710 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2 files changed