Passenger compatibility changes
Merge pull request #11 from danhart/upstream_changes

Passenger compatibility changes