[Git][wine/wine-staging][master] Rebase against 6e6334d4293b235fe11f05c556acf6cecb173412.