Upgrade to Rails 4.1.6
Merge branch 'master' into bootstrap