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