Work around importer test to get the windows build going
Merge remote-tracking branch 'upstream/master'