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