[us-commits] [ehb54/ultrascan3] 6d5831: somo dev, fixes for windows build