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