Fix server not getting killed after tests are finished ...
Merge branch 'rails_2_3'