Forward compatibility with Hspec 2.0
Merge pull request #860 from sol/master

Forward compatibility with Hspec 2.0