Add ruby-version file
Merge remote-tracking branch 'upstream/master'