Switches back to mainline rails/rails repository
Merge branch 'rails_4_1'