work in progress for 2.5.21dev, updates for new msys2-based distribution