Merge branch 'rj/mingw-isguid'