Patch Set 6: Looks good to me, but someone else must approve; IP review completed

this fix still looks ok for me now. Is there anybody voting still against it? Shawn, there is still a -2 from you. Something I could do to convince you?