Merge pull request #224 from jtomasek/rails_update

Rails update
Merge remote-tracking branch 'upstream/master'