Remove specs for now
Merge branch 'master' into 2-2-stable