Build script cleanup
Merge branch 'master' into drobofs