Merge branch 'upgrade_to_rails_4.1.4' into 'master'