Add .ruby-version
Merge branch 'develop'
Merge remote-tracking branch 'rails-base/master' into rails-base-update
Merge branch 'rails-base-update'