Upgrade to Rails 4.1.8
Merge branch 'rails-4.1.8'