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