[Git][wine/wine-staging][master] 2 commits: Rebase against 6e15604c48acd63dd8095a4ce2fd011cb3be96db.