Prefer serve_static_files if it exists
Switch to 4.2 release
Merge pull request #300 from rails/fix-rails-master

Prefer serve_static_files if it exists
Merge branch 'master' into fix-glob-virtual-file