With Josh's help we forked the trunk into a 2.3-fixes branch and updated the configure.ac in trunk to be 2.4. Hopefully, we got this right and everything will go smoothly with this new version.