[Git][wine/wine-staging][master] Rebase against 7b6944c6264202a57ad3d354cc754f02d2a23a9a.