.gitignore
Merge branch 'stable'