A few distro fixes for Windows support
Merge pull request #1915 from jbertram/master

A few distro fixes for Windows support