Merge pull request #330 from rspec/handle_undefined_encoding_conversions

Handle undefined encoding conversions
Conflicts:
	Changelog.md