path fix, less debug
Merge branch 'upstream'
build