MERGE: fixes to prep-bin-dist-mingw, and add separate rule to tar the bindist