Updated rails patch

username-removed-41801 requested to merge github/fork/ferdinandrosario/upgrade into master Nov 19, 2015