merge-octopus: Work around environment issue on Windows