Merge branch 'readdir' (readdir speedup and sanity checking)