Merge pull request #2 from purplecabbage/2.4.0Prep

2.4.0 prep