Fixed: WWDC_DIRNAME (-o) was overridden
Merge branch 'sirlantis-patch-1' (fixe -o overwritten)