update rails master
rails master fixes