Avoid Ruby 2.0 warnings when running tests
Merge pull request #321 from floere/master

Avoid Ruby 2.0 warnings when running tests