Fix a test assertion throwing an error under Ruby 2.0.0
Fix a case mismatch in one of the tests
Merge remote-tracking branch 'upstream/master' into master-clean
Resume testing against Ruby 2.0.0