git merge from arthrex for Rails 4 support