app-emulation/wine: merge upstream changes