Merge pull request #1698 from mstorchak/lsof