bugfix
Merge branch 'wine' into wine-osx