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