Committing this to the v1.2 branch
edited the comment for v1.2
more v1.2 changes
.gitignore, .gitattributes for my branch
cleaning up
Merge branch 'v1.2'