Merge back commits from WineHQ