Merge "Cleanup .gitignore file" into devel/master