Upgraded to Rails 4.1.5.
Merge branch 'master' into staging