Fixed #9579
Merge branch 'master' of git://github.com/rails/rails