Merge pull request #1381 from rubenk/filecount-fix-resource-leak