restore Windows compatibility
add remaining changes to restore Windows compatibility
Merge branch 'master' into 2.1