Upgrade from Rails 4.0.2 to 4.0.3
Merge