update rails
Merge branch 'master' into 4.0