update rails
Merge branch 'release/1.3'