Don't fail on Windows because of imports that don't exist
Merge branch 'master' into 162-int
Changelog re #162
Merge branch '162-int'