rails 4.0.0.rc2
Merge branch 'feature-rails400-rc2'