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