When possible I simply cherry-picked fixes from the master branch, but sometimes I had to redo them manually. Here I started with ActiveSupport, I'm not sure I eliminated them all yet because t...