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