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