File Specs wrong, incorrect use of framework
Merge remote-tracking branch 'upstream/master'

Merge in upstream
Merge pull request #7912 from dhoerl/master

Fix errors in the spec