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