tentatively added windows entry, commented pending fixes
gain compatibility with HDP2, lose HDP1
fix for odd behavior on win/HDP
Merge branch 'master' into dev