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