make class safe for non-python builds
Merge branch 'windows'