Port #580 to 2-99

Conflicts:
	Changelog.md
Merge pull request #587 from rspec/2-99-anyinstance-fix

Port #580 to 2-99