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