2 2 stable

Just an update to work with modern Spree