Enable building i386 wine / amd64 compat packages
Merge remote-tracking branch 'upstream/master'