Merge branch 'gitignore' into 'develop'