[Git][wine/wine-staging][master] Rebase against 96a94318125332cd7aa80c475b35e38439b7c2b3.