Upgrade Rails to 4.1.5
Merge remote-tracking branch 'origin/master'