Upgrade to spray 1.1-M7