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