Merge branch 'gv/mingw-p4-mapuser'