A set of portability fixes from the Debian packaging
Merge branch '4.4'