Some updates for the SilverStripe 2.4.x branch