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