Upgrade for Rails to 3.0.19 see TDLR-420
Merge remote-tracking branch 'origin/master'