redo merge by hand
Merge branch 'fix-broken-commit'
more .gitignore changes