Some updtes for the SilverStripe 3.0.x branch