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