Protected windows-specific changes in 1a858c7be856d7fd8c440ec7290adcf1af8e7da8 to break build on other platforms.
Merge pull request #725 from virtualritz/development

Protected windows-specific changes in 1a858c7be856d7fd8c440ec7290adcf1af...