[Git][wine/wine-staging][master] 2 commits: Rebase against 1f947b1c62c4f6fdfad4da812567cf33c904c1eb.