Ruby 2.0 changes
Merge pull request #68 from danmcp/master

Merged by openshift-bot