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