Directory Listing
Merge fix from tags/1.9.4/bugfixes.
Branch.
Imported upstream sources (pruned for DFSG compliance).