Add support for updated msys #6