Fix subspecs
Merge branch '2.0-development' into twitter-example