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