Upgrade to the latest spring surf