Release 2.4

For review. I'll commit it myself when it's time!