This will allow us to remove the warning fix patch added in bug 666672.
Created attachment 557756 [details] [diff] [review]
Patch. There's only one upstream change relevant to the code we pull.
This needs to be applied after Bug 666672 lands; I'll ask for review at that point.
Created attachment 562588 [details] [diff] [review]
Update patch v2
Now that the warning fixes from bug 666672 have landed here and upstream, we can go ahead with our update.