Merge pull request #2 from purplecabbage/2.4.0rc2Prep

2.4.0rc2 prep