Merge branch 'support_for_sinatra_apps'
don't raise an exception if neither Rails or RACK_ROOT are defined
Merge branch 'master' into support_for_sinatra_apps