Support both RSpec 1.x and 2.x
Merge pull request #1813 from strzibny/master

Support RSpec 2.x