Merge debian directory from johnl/passenger4