fixed distcc build
Merge branch 'master' into 1.0