Merge in a post-Wine-0_9_5 change to get rid of some warnings. Thanks to