Upgrade Rails 4.1.7 to 4.1.8
Merge branch 'master' into quick-entry