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