Is this patch OK to merge to the 4.0 branch?
I'd like Chris Bieneman to look at this as well before its merged just to be sure, but if he's happy, I'm happy.
Hi Chris, Does this look OK for the release_40 branch?
Sorry I was OOO the last few weeks. This looks good for 4.0 to me.
Merged: r304238