Patch forthcoming.
Created attachment 222522 [details] the patch
Created attachment 222538 [details] the patch
Created attachment 222539 [details] the patch
Landed in http://trac.webkit.org/changeset/162992