Initial w32 merge