Update gitignore
Update gitattributes
Merge branch 'master' into opengl-support