Comment 4 for bug 961936

I won't have time in the next few days to work on this, but it's almost done. So if anybody wants to grab the branch I worked on and continue the work in there, feel free to do so. :-)