Merge pull request #2815 from pyhalov/pvscsi