merging in 6.0 changes
further merges with 6.0
changed .gitignore