Rails 4.1.7.
Merge branch 'master' into prod