Upgrade from rails 4.0.2 to 4.0.3
Merge branch 'bump-rails-version'