Snow Leopard: Fix creation of build paths to test script
Merge remote-tracking branch 'origin/master'