Make sub specs actually work
Merge branch 'release/0.15'