Make sure specs run
Merge branch 'master' into v1