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