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