Comment 9 for bug 1011415

 Several patches are still on the way to upstream, I will paste it after it is merged into upstream.