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