Merge pull request #792 from nico/statdir