Added proper header merging to the simple server.
Merge branch '0.9-maintenance'