Remove errant debug line
Merge branch 'master' into solaris_fixes
Support for dirents without d_type (e.g. Solaris)