[Git][wine/wine-staging][master] 2 commits: Rebase against cd858d59d6532a0cf624ff1dabc57a370deb43bf.