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