Spec helper corrected.
Merge branch 'master' into staging