simplified and more stable build logic
removed erroneous .gitignore line
Merge branch 'master' into xmlimport