[patch] PR 8761 and 7076, mainline

[Benjamin Kosnik]

>This second change should also be put into the 3.3 branch patch along with a
>test case.  Do you all want the 3.3 branch patch redone, or submit it as a
>patch-with-testcase to the patch?

I'm hesitant to ask you to do anything more until I get an opportunity
to review this patch into which you have put so much effort. I am really
far behind on patch review at the moment.

Sorry for the delay.

Please do not add anything else to this body of work (there is already a
bit of unrelated stuff, like the comment fix ups). If you find more
things, please do smaller axillary patches that can be applied
separately. 

You should also fill out the assignment forms. I think Phil can help you
with that process.

best,
benjamin