Avoid triggering ActiveSupport deprecation warning (#58)
Version 4.1.5
Merge branch 'master' into custom