Replace .gitignore with .gitignore_global
Merge branch 'master' into experimental