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