Rails 4.1.1.
Merge branch 'master' into staging