do not generate build number
ignore target/ directory
Merge branch 'upstream'