Merging v2.x stable

I'm at a loss as to why so many commits are in here, although the diff is correct.  Whatever!