Eric Berry Merge pull request #11 from Gargron/fix-rails-6-support