Bug 1066383, fix warning, CLOSED TREE
Merge inbound to m-c to fix wError bustage a=merge CLOSED TREE