branch for 2.4.0 RC2 changes
Merge pull request #1 from purplecabbage/2.4.0rc2Prep

branch for 2.4.0 RC2 changes