Rails 4.1.5 (security) and other updates
Merge branch 'master' into bootstrap