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