Merge branch/2014-03-21/pellesc into the master sources.
Preserve the first table entry, so as to avoid false positives when this is kept alive by a register or stack-local variable.
Avoid spurious output from rmdir.