Upgrade to 2.4.0

@curtis for your consideration :sunflower: