RSpec: Minor updates to custom matchers.
Merge remote-tracking branch 'upstream/master'