Updated spec.
Merge branch 'master' into staging