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