Added a folder to .gitignore
Merge remote-tracking branch 'origin/release-1.0' into release-1.0