three ways
merging branch
Merge branch 'craigp-ruby-contrib'