Fix for Rails 4.1.0+ PR #95 in upstream