Rephrase matcher failure messages according to RSpec 3 style
Retain compatibility with RSpec 2 matchers