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