Patch forthcoming.
Created attachment 296824 [details] work in progres
Ooops, I filed a new bug and put the newer patch there. *** This bug has been marked as a duplicate of bug 165741 ***