Merged r194235.  rdar://problem/23944407

Canonical link: https://commits.webkit.org/164912.334@safari-601.2.7.2-branch
git-svn-id: https://svn.webkit.org/repository/webkit/branches/safari-601.2.7.2-branch@194236 268f45cc-cd09-0410-ab3c-d52691b4dbfc