The final PR for this is in. See: https://github.com/bitcoin/bitcoin/pull/3346
Ready for final review and testing. It's merge-ready barring any new reports of build problems.
Since you said you're happy to send along the bounty (when merged), I have a proposal for you:
As mentioned above, I'm not ok with keeping it because IMO it was a regression that I introduced anyway. Instead, I'd like to see it donated to Sean's Outpost (http://seansoutpost.com).
However, given that they are working hard to help families for Christmas, I'd really hoped to have this taken care in time to contribute.
Could I persuade you to go ahead and send along half to Sean's Outpost, and the rest after merge? I obviously have every intention of getting this into master.