Upgrade to spray 1.0-M7