merge in Winehq changes to reduce noise svn path=/trunk/; revision=13772
Import from Wine svn path=/trunk/; revision=13686