railsapp changes merged upstream