-since we had an accidental merge between devel and 2.1.x, I'm rounding up these changes that need to be in 2.1.x and putting them here.
-since we had an accidental merge between devel and 2.1.x, I'm rounding up these changes that need to be in 2.1.x and putting them here.